Move over another django 1.5 modification from Rob's branch

See:
https://bitbucket.org/robert_osborne/django-articles/commits/2a3254c677bf87e854e84f4f180d08e8b6719aeb