Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 23 May 2017 12:58:20 +0000 (08:58 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 23 May 2017 12:58:20 +0000 (08:58 -0400)

Trivial merge