Merge from trunk revision 9769564e7456453e2273071d0faa5aab2554ff78.