Merge tag 'upstream/4.02.2' into experimental/master
authorStephane Glondu <steph@glondu.net>
Fri, 19 Jun 2015 15:59:21 +0000 (17:59 +0200)
committerStephane Glondu <steph@glondu.net>
Fri, 19 Jun 2015 15:59:21 +0000 (17:59 +0200)
Upstream version 4.02.2


Trivial merge