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

Trivial merge