Fix merge of master.