Merging to get this branch up to date.