Merge tag 'upstream/1.1.5'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 6 Jun 2016 14:37:31 +0000 (16:37 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 6 Jun 2016 14:37:31 +0000 (16:37 +0200)
Upstream version 1.1.5


Trivial merge