Merge pull request #9271 from jpellegrini/master