Merge branch 'hotfix/1.0.2' v1.0.2
authorLaury GvR <laury@gaslightmedia.com>
Fri, 5 Jun 2015 18:35:59 +0000 (14:35 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 5 Jun 2015 18:35:59 +0000 (14:35 -0400)

Trivial merge