Merge branch 'hotfix/1.7.1' v1.7.1
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 18 Oct 2018 20:17:39 +0000 (16:17 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 18 Oct 2018 20:17:39 +0000 (16:17 -0400)

Trivial merge