Merge branch 'master' of https://github.com/reactos/reactos
authorAlex Ionescu <aionescu@gmail.com>
Sun, 4 Feb 2018 17:34:27 +0000 (09:34 -0800)
committerAlex Ionescu <aionescu@gmail.com>
Sun, 4 Feb 2018 17:34:27 +0000 (09:34 -0800)

Trivial merge