merged from trunk

[SVN r45844]
merged from trunk

[SVN r47983]
merged from trunk

[SVN r48896]
merged from trunk

[SVN r49607]