Merge tag 'upstream/3.0.0'
authorSophie Brun <sophie@freexian.com>
Mon, 14 Dec 2015 10:05:55 +0000 (11:05 +0100)
committerSophie Brun <sophie@freexian.com>
Mon, 14 Dec 2015 10:05:55 +0000 (11:05 +0100)
Upstream version 3.0.0


Trivial merge