Merge with trunk up to revision 45620.
23 files changed