Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 26 Apr 2017 21:05:37 +0000 (17:05 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 26 Apr 2017 21:05:37 +0000 (17:05 -0400)

Trivial merge