Merge branch 'reorganise-context-menu-initial' of github.com:aljelly/desktopfolder into reorganise-context-menu-initial