Merge branch 'hotfix/1.0.2' v1.0.2
authorLaury GvR <laury@gaslightmedia.com>
Fri, 19 Feb 2016 21:41:18 +0000 (16:41 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 19 Feb 2016 21:41:18 +0000 (16:41 -0500)

Trivial merge