Co-authored-by: Michael Wurzer <michael.wurzer@sequality.at> Co-authored-by: Marc Cornellà <marc.cornella@live.com>
Also fixed minor typo Closes #6108 Co-authored-by: Matt <sifrawr@gmail.com>