Merge branch 'hotfix/1.0.2' v1.0.2
authorLaury GvR <laury@gaslightmedia.com>
Fri, 28 Aug 2015 13:57:56 +0000 (09:57 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 28 Aug 2015 13:57:56 +0000 (09:57 -0400)

Trivial merge