Merge pull request #954 from jrogelstad/20438