Merge tag 'upstream/0.9.0+ds'
authorAfif Elghraoui <afif@ghraoui.name>
Sat, 5 Mar 2016 21:42:53 +0000 (13:42 -0800)
committerAfif Elghraoui <afif@ghraoui.name>
Sat, 5 Mar 2016 21:42:53 +0000 (13:42 -0800)
Upstream version 0.9.0+ds


Trivial merge