Merge upstream git branch for release 0.7

This commit is contained in:
Steve Langasek 2015-05-05 23:32:33 +00:00
commit 3967dc6524

Diff Content Not Available