Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Sep 2017 18:10:25 +0000 (14:10 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Sep 2017 18:10:25 +0000 (14:10 -0400)

Trivial merge