Fixed a compiler option
Merge branch 'master' into review
Merge branch 'master' into st-andrews