Merged in default (pull request #638)

2019-11-11, Gary Kramlich