Tested with WordPress 4.0
Merge branch 'master' of https://github.com/badfun/custom-post-type-auto-menu