Merge branch 't9_django_command'
Merge branch 't10_signals'
Fixes according to comments
Merge branch 't9_django_command'. With changes according to comments.
Merge branch 'master' into t10_signals