Merge from trunk revision f3e9c98a9f40fc24bb4ecef6aaa94ff799c8d587.