Merged in default (pull request #605)

2019-10-18, Gary Kramlich