Adds Django 1.6 support
Merge remote-tracking branch 'upstream/master'