Restore compat. with django builtin commands.

see #621
Merge branch '1.1.x'
Merge branch 'master' into feature-responsive
Few changes...

see #585