Upstream update

This PR updates us to the latest upstream version of Subway. @bchavet , can you merge and deploy this when convenient?