bring up to current npm/master