Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 26 May 2016 21:21:02 +0000 (17:21 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 26 May 2016 21:21:02 +0000 (17:21 -0400)

Trivial merge