Don't pollute the context menu with a ton of stuff.
Merge branch 'master' into st3