Django 1.6 preview support by @ianare and @marky1991 merged to master