Merged in feature/testing-tweaks (pull request #26)
develop
2019-07-24, Gary Kramlich