Merge branch 'mbm-redesign'
Merge branch 'mbm-redesign'
Merge branch 'mbm-redesign'
Fixed stupid logging error from last check-in.
Merge branch 'master' into mbm-redesign