Fix regression where duplicate function names were not an error.
Merge branch 'master' into menu-data