Merged in default (pull request #601)

2019-10-15, Gary Kramlich