Merge of upstream:master