Merge branch 'rs/clean-menu-item-defn' into maint

* rs/clean-menu-item-defn: clean: use f(void) instead of f() to declare a pointer to a function without arguments