Should we merge this with rc.1? The list of contributors above is the same as the one below (except it includes all the new commits, too.