Merge from trunk revision aa8f4242efc99f24de73c59d53996f28db28c13f.