Fixes compatibility with Django 1.7.  Closes #1850