Merge branch 'hotfix/1.7.12' v1.7.12
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 7 Jan 2019 19:47:04 +0000 (14:47 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 7 Jan 2019 19:47:04 +0000 (14:47 -0500)

Trivial merge