Merge branch 'master' into alpha0.2
Merge branch 'alpha0.2'