merged from trunk

[SVN r49607]