Merge changes from master.