Initial attempt to fix django 1.6 timeout=None issue