Removed the -fpermissive flags completely.
Merge remote-tracking branch 'upstream/master'