Merge branch 'hotfix/1.7.8' v1.7.8
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 27 Nov 2018 19:25:59 +0000 (14:25 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 27 Nov 2018 19:25:59 +0000 (14:25 -0500)

Trivial merge