Django 1.4.5 rebase

Totally new PR with all fixes and rebases.