Recompile with 1.6.3
Merge branch 'master' into language-menu
Cleanup