Merge pull request #1278 from Fuzzysqurl/master

Placeholder sprites