Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Aug 2016 16:04:07 +0000 (12:04 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Aug 2016 16:04:07 +0000 (12:04 -0400)

Trivial merge