Add shortcut-menu for urls
Merge branch 'master' into mac