Merge branch 'release-0.1' into develop
Re-added remote develop as the tracking branch.
Merge branch 'master' into develop