add -g to 'release' optimizations
Merge remote-tracking branch 'origin/master'