Merge branch 'develop'
Kill an unnecessary reference
Merge branch 'master' into develop