Merge branch 'hotfix/1.7.7' v1.7.7
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 27 Nov 2018 17:02:09 +0000 (12:02 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 27 Nov 2018 17:02:09 +0000 (12:02 -0500)

Trivial merge