Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Jun 2018 14:15:31 +0000 (10:15 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Jun 2018 14:15:31 +0000 (10:15 -0400)

Trivial merge