merged from trunk

[SVN r45503]
merged from trunk

[SVN r45985]
merged from trunk

[SVN r47983]
merged from trunk

[SVN r47991]
merged from trunk

[SVN r48062]
merged from trunk

[SVN r48169]
merged from trunk

[SVN r48605]
merged from trunk

[SVN r49133]
merged from trunk

[SVN r49439]
merged from trunk

[SVN r49607]