[kronosnet/kronosnet] 920853: Merge pull request #238 from kronosnet/coverity_scan