Merge branch 'hotfix/1.0.2' V1.0.2
authorLaury GvR <laury@gaslightmedia.com>
Wed, 20 Aug 2014 15:01:09 +0000 (11:01 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 20 Aug 2014 15:01:09 +0000 (11:01 -0400)

Trivial merge