Merge pull request #16406 from totten/master-menu-warn