Right-click menu wasn't properly disabled
Merge remote-tracking branch 'origin/master' into winextras