Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Removing development compiler options from master branch (no merges from this point should come out of master).
Merge branch 'develop'