Merge pull request #5 from the-Arioch/Mantis_0006193

#6193 and fix for typo in one of error messages
Merge remote-tracking branch 'remotes/Upstream/master'