Updates for Django >= 1.5