Initial merge of upstream-master.