Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 24 Apr 2015 17:24:52 +0000 (13:24 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 24 Apr 2015 17:24:52 +0000 (13:24 -0400)

Trivial merge