Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 30 Jun 2014 18:24:31 +0000 (14:24 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 30 Jun 2014 18:24:31 +0000 (14:24 -0400)

Trivial merge