Core: Fix non pch build
Core: Kill AGAIN whitespace :(
Merge remote-tracking branch 'upstream/master'