Upgrade to GAE 1.8.7