Merge pull request #955 from jrogelstad/21679