Z-index correction.
Merge remote-tracking branch 'origin/master' into UI
Merge remote-tracking branch 'origin/master' into UI
Added hot key support to options menu.
Merge remote-tracking branch 'origin/UI'