Merge tag 'upstream/0.10.0+ds'
authorAfif Elghraoui <afif@debian.org>
Tue, 24 Jan 2017 03:10:24 +0000 (19:10 -0800)
committerAfif Elghraoui <afif@debian.org>
Tue, 24 Jan 2017 03:10:24 +0000 (19:10 -0800)
Upstream version 0.10.0+ds


Trivial merge