Merge branch 'hotfix/1.0.18' v1.0.18
authorLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jan 2018 19:27:45 +0000 (14:27 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jan 2018 19:27:45 +0000 (14:27 -0500)

Trivial merge