Prepare for merge into master.