Merge branch 'develop'
Merge branch 'develop'
More documentation tweaks for first release.
Merge branch 'master' into develop