Automated merge with https://bitbucket.org/VirLinden/viewer-development-shining-fixes
Automated merge with https://bitbucket.org/VirLinden/viewer-development-shining-fixes

gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm