Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Wed, 6 Jun 2018 17:33:34 +0000 (13:33 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 6 Jun 2018 17:33:34 +0000 (13:33 -0400)

Trivial merge