Merge branch 'hotfix/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 28 Apr 2015 12:34:37 +0000 (08:34 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 28 Apr 2015 12:34:37 +0000 (08:34 -0400)

Trivial merge