Merge branch 'hotfix/1.0.2' v1.0.2
authorLaury GvR <laury@gaslightmedia.com>
Thu, 25 Jun 2015 19:22:29 +0000 (15:22 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 25 Jun 2015 19:22:29 +0000 (15:22 -0400)

Trivial merge