No, really, add the compatibility shim
Merge branch 'master' into geezer