Merge branch 'hotfix/1.2.1'
Merge branch 'release/1.3.0'
Upgrade to django-1.4.4
Merge branch 'hotfix/1.3.1' into develop