Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 11 May 2017 15:18:52 +0000 (11:18 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 11 May 2017 15:18:52 +0000 (11:18 -0400)

Trivial merge