Merge tag 'upstream/0.8.4+ds'
authorAfif Elghraoui <afif@ghraoui.name>
Thu, 12 Nov 2015 02:46:08 +0000 (18:46 -0800)
committerAfif Elghraoui <afif@ghraoui.name>
Thu, 12 Nov 2015 02:46:08 +0000 (18:46 -0800)
Upstream version 0.8.4+ds


Trivial merge