am fdf2454d: merge from open-source master