Merged in bugfix/pvs-studio-false-positive-v568 (pull request #78)
develop
2020-05-12, Gary Kramlich