Added Support for Django>=1.6