fix typo
Merge remote-tracking branch 'polinom/master'
Merge branch 'master' into django-fluent