Merge tag 'upstream/0.8.3'
authorAfif Elghraoui <afif@ghraoui.name>
Mon, 8 Jun 2015 05:30:07 +0000 (22:30 -0700)
committerAfif Elghraoui <afif@ghraoui.name>
Mon, 8 Jun 2015 05:30:07 +0000 (22:30 -0700)
Upstream version 0.8.3


Trivial merge