Rolling up PRs in the queue

r? @alexcrichton