Fix normal maps with spaces in filename not getting loaded
Merge remote-tracking branch 'scrawl/master'