Merge tag 'upstream/1.1.4'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Fri, 3 Jun 2016 12:06:54 +0000 (14:06 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Fri, 3 Jun 2016 12:06:54 +0000 (14:06 +0200)
Upstream version 1.1.4


Trivial merge