Various whitespace/comments and a PRIORITY
Merge remote-tracking branch 'origin/master' into TextureRefactoring