1239 Update to django 1.5.4