Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Mon, 20 Nov 2017 21:38:13 +0000 (16:38 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 20 Nov 2017 21:38:13 +0000 (16:38 -0500)

Trivial merge