fork reason: upgraded to work for django 1.5.2