Fixes #898. This was previously fixed in the scenegraph branch likely
for similar reasons as to its  discovery by @Ayrton81 in his fork
regarding the terrain classes. Due to the time remaining before the
scenegraph branch is merged in, I'm applying this fix directly.

Signed-off-by: Jared Woolston <jwoolston@tenkiv.com>
Merge branch 'master' into scenegraph