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

Trivial merge