Refs #7972 Merge Master into branch to resolve conflict.