Merged from trunk.  Closes #8916