Automated merge with https://bitbucket.org/mani_linden/viewer-development
Automated merge with https://bitbucket.org/mani_linden/viewer-development

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