Merged in bugfix/valgrind-catchup (pull request #73)
develop
2020-03-20, Gary Kramlich