Merge pull request #1287 from eintw1ck/master
authorJohn Kessenich <johnkslang@users.noreply.github.com>
Mon, 12 Mar 2018 18:39:00 +0000 (12:39 -0600)
committerGitHub <noreply@github.com>
Mon, 12 Mar 2018 18:39:00 +0000 (12:39 -0600)
include/Common.h: reorder includes to avoid redefinition on some platforms


Trivial merge