Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Sep 2014 16:03:18 +0000 (12:03 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Sep 2014 16:03:18 +0000 (12:03 -0400)

Trivial merge