Merge of change 71a39d33831be9d381f37a07fc785d5fe8833a96 from master.