Merge tag 'upstream/4.02.3' into experimental/master
authorStephane Glondu <steph@glondu.net>
Mon, 10 Aug 2015 09:13:35 +0000 (11:13 +0200)
committerStephane Glondu <steph@glondu.net>
Mon, 10 Aug 2015 09:13:35 +0000 (11:13 +0200)
Upstream version 4.02.3


Trivial merge