Merge branch 'hotfix/1.0.2'
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 11 Jun 2015 22:25:43 +0000 (18:25 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 11 Jun 2015 22:25:43 +0000 (18:25 -0400)

Trivial merge