Merge branch 'hotfix/1.7.2' v1.7.2
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 18 Oct 2018 20:29:22 +0000 (16:29 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 18 Oct 2018 20:29:22 +0000 (16:29 -0400)

Trivial merge