typo fix
Merge branch 'master' into django1.5