Merge a few updates from the unstable branch.