Merge pull request #863 from Arantor/release-2.1

More menu madness