Merge from upstream (r1448)