GuiButtonCtrl Inactive Bug AND Fix

Steps to reproduce:
1) Create a GuiButtonCtrl with a skin/theme.
2) Set the button to inactive.
BUG 3) Mouse over the button and the button will highlight as though it can be depressed.

I just changed the order in GuiButtonCtrl::onRender() to the following:

S32 indexMultiplier = 1;
if( !mActive )
  indexMultiplier = 4;
else if ( mMouseOver ) 
  indexMultiplier = 3;
else if ( mDepressed || mStateOn )
  indexMultiplier = 2;

I don't want to double post this to the TGE Engine Forum and hopefully GG will see this and get it in the next build.