Merge tag 'upstream/0.5'
authorSophie Brun <sophie@freexian.com>
Mon, 18 Apr 2016 09:59:46 +0000 (11:59 +0200)
committerSophie Brun <sophie@freexian.com>
Mon, 18 Apr 2016 09:59:46 +0000 (11:59 +0200)
Upstream version 0.5


Trivial merge