Merge tag 'upstream/0.8.3+ds1'
authorAfif Elghraoui <afif@ghraoui.name>
Thu, 25 Jun 2015 02:27:39 +0000 (19:27 -0700)
committerAfif Elghraoui <afif@ghraoui.name>
Thu, 25 Jun 2015 02:27:39 +0000 (19:27 -0700)
Upstream version 0.8.3+ds1


Trivial merge