Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Thu, 15 Feb 2018 15:37:54 +0000 (10:37 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 15 Feb 2018 15:37:54 +0000 (10:37 -0500)

Trivial merge