Automated merge with https://hg.productengine.com/secondlife/viewer-trunk/
Automated merge with https://hg.productengine.com/secondlife/viewer-trunk/

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