Merge tag 'upstream/4.02.2_rc1' into experimental/master
authorStephane Glondu <steph@glondu.net>
Fri, 12 Jun 2015 14:23:55 +0000 (16:23 +0200)
committerStephane Glondu <steph@glondu.net>
Fri, 12 Jun 2015 14:23:55 +0000 (16:23 +0200)
Upstream version 4.02.2~rc1


Trivial merge