initial changes for Django-1.5.4 upgrade