merged from trunk

[SVN r45230]
merged from trunk

[SVN r45844]
merged from trunk

[SVN r46303]
merged from trunk

[SVN r47983]
merged from trunk

[SVN r48605]
merged from trunk

[SVN r49133]
merged from trunk

[SVN r49439]