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

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