Automated merge with https://bitbucket.org/seraph/mesh-development-vs2010
Automated merge with https://bitbucket.org/seraph/mesh-development-vs2010

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