Make changes required to merge with master.