Update to 0.2.1 (Sugar 1.0.9)
Merge branch 'master' into travis.linux