Merge pull request #900 from sipa/movebackupmenu