Update for django >= 1.4.3 / 1.3.5 / 1.5