Merge some changes to master.