Restore compat. with django builtin commands.

see #621
Merge branch '1.1.x'