Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010

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