0.3.7: Sugar 1.2.2
Merge branch 'master' into linux