MERGE: late changes to 0.7.3
MERGE: late changes to 0.7.3

--HG--
branch : v0-7

cbeck88/cegui-mirror-two,cbeck88/cegui-mirror-two,cbeck88/cegui-mirror-two,cbeck88/cegui-mirror-two,cbeck88/cegui-mirror-two