Merged in bugfix/redundant-error-checks (pull request #75)
develop
2020-04-11, Gary Kramlich