Merge branch 'hotfix/1.7.11' v1.7.11
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 6 Dec 2018 16:13:42 +0000 (11:13 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 6 Dec 2018 16:13:42 +0000 (11:13 -0500)

Trivial merge