Upgrade to 1.8.7