Upgrade to underscore 1.7.0