Merge tag 'upstream/0.6.4'
authorSophie Brun <sophie@freexian.com>
Wed, 3 Feb 2016 16:12:22 +0000 (17:12 +0100)
committerSophie Brun <sophie@freexian.com>
Wed, 3 Feb 2016 16:12:22 +0000 (17:12 +0100)
Upstream version 0.6.4


Trivial merge