Merge branch 'hotfix/1.0.2' v1.0.2
authorLaury GvR <laury@gaslightmedia.com>
Thu, 23 Mar 2017 15:47:02 +0000 (11:47 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 23 Mar 2017 15:47:02 +0000 (11:47 -0400)

Trivial merge