This branch should be merged into master.