Merge latest work into master.