Merge branch 'hotfix/1.7.10' v1.7.10
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 4 Dec 2018 16:25:48 +0000 (11:25 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 4 Dec 2018 16:25:48 +0000 (11:25 -0500)

Trivial merge