Merge pull request #1091 from billhollings/master

Update project build settings