More cleanup for generic magic prefixes
Merge branch 'master' of https://github.com/blink1073/jupyter_kernel