Merge pull request #2618 from codebrainz/os-info-improvements