Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Mon, 13 Nov 2017 19:07:51 +0000 (14:07 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 13 Nov 2017 19:07:51 +0000 (14:07 -0500)

Trivial merge