Merge branch 'develop'
Merge branch 'develop'
Disabled menu items bug fix.

    Context menu will now ignore non-existent item disable requests, instead of failing.
Merge branch 'master' into develop