Upgrade to first-mate 1.7