Catch up with master, there are still a couple of things to add before deleting this branch.