Merge tag 'upstream/0.9.1+ds'
authorAfif Elghraoui <afif@ghraoui.name>
Sun, 19 Jun 2016 21:18:01 +0000 (14:18 -0700)
committerAfif Elghraoui <afif@ghraoui.name>
Sun, 19 Jun 2016 21:18:01 +0000 (14:18 -0700)
Upstream version 0.9.1+ds


Trivial merge