Upgraded to App Engine 1.8.9