squashed commits from django-15 branch
Merge branch 'master' into ui-improvements