Some work on Django 1.6 support.