Explicitly disable items in context surround menu
Merge pull request #479 from Gama11/RefactorSurround

Explicitly disable items in context surround menu