Fix for Django 1.5. Closes #222