Copy over fixes for the storage backend from djangoappengine-1-4.