Merge tag 'upstream/1.3.3'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Sat, 12 Sep 2015 11:58:07 +0000 (13:58 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Sat, 12 Sep 2015 11:58:07 +0000 (13:58 +0200)
Upstream version 1.3.3


Trivial merge