Update to support GAE 1.7.6
Merge branch 'update-1.7.6'