fixes for Django>=1.5