Merge tag 'upstream/1.2.0'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Sat, 4 Feb 2017 18:15:54 +0000 (19:15 +0100)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Sat, 4 Feb 2017 18:15:54 +0000 (19:15 +0100)
Upstream version 1.2.0


Trivial merge