Merge pull request #6518 from puckipedia/master