Quick fix for botching the callback
Merge branch 'master' into wp_import
Cleanup after code review