<Patches from bitbucket pull #63>
Merge branch 'feature/django-1.6' into develop