Merge branch 'develop'
Added build status to make us all aware.