am 95faecef: merge from open-source master