Mostly-merge master.