Merge branch 'hotfix/1.6.79' v1.6.79
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 9 Apr 2018 19:35:49 +0000 (15:35 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 9 Apr 2018 19:35:49 +0000 (15:35 -0400)

Trivial merge