Added compatibility for Django>=1.4