Remove some urls in shortcuts
Merge branch 'master' into mac