Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 13:07:17 +0000 (09:07 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 13:07:17 +0000 (09:07 -0400)

Trivial merge