Merge pull request #5200 from akallabeth/os2_fixes
authorDavid Fort <rdp.effort@gmail.com>
Fri, 18 Jan 2019 17:04:23 +0000 (18:04 +0100)
committerGitHub <noreply@github.com>
Fri, 18 Jan 2019 17:04:23 +0000 (18:04 +0100)
Os2 fixes


Trivial merge