Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 19 Sep 2014 17:35:38 +0000 (13:35 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 19 Sep 2014 17:35:38 +0000 (13:35 -0400)

Trivial merge