Changes for Django1.5