Merge tag 'upstream/4.02.1' into experimental/master
authorStephane Glondu <steph@glondu.net>
Tue, 21 Oct 2014 09:41:03 +0000 (11:41 +0200)
committerStephane Glondu <steph@glondu.net>
Tue, 21 Oct 2014 09:41:03 +0000 (11:41 +0200)
Upstream version 4.02.1


Trivial merge