Merge branch 'master' of https://github.com/reactos/reactos
authorgedmurphy <gedmurphy@reactos.org>
Thu, 12 Oct 2017 20:36:29 +0000 (21:36 +0100)
committergedmurphy <gedmurphy@reactos.org>
Thu, 12 Oct 2017 20:36:29 +0000 (21:36 +0100)

Trivial merge