am d428e48a: merge from open-source master