Merged in default (pull request #577)

2019-10-04, Gary Kramlich