Adds support for Django 1.6 w/o breaking older versions
Merge commit '3da71a7a4d03fada1b8127f0ff10851d4ce5d3f2'

# By Steve Bywater
# Via Steve Bywater
* commit '3da71a7a4d03fada1b8127f0ff10851d4ce5d3f2':
  Adds support for Django 1.6 w/o breaking older versions