Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 4 May 2017 16:40:36 +0000 (12:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 4 May 2017 16:40:36 +0000 (12:40 -0400)

Trivial merge