Version 1.1
Merge branch 'master' into menus_squash