Reverted back to App Engine 1.8.7