django 1.5 upgrade branch!