Increased compatability with GAE

This pull request only has a single commit, and should not have of the... problems with its commit history as did the last one.