Fix for AppEngine
Merge pull request #1709 from samuelhug/test-branch

Fix for AppEngine