Merge branch 'develop'
Fix the build status indicator.
Merge branch 'master' into develop