Merge branch 'release/1.1.5' master v1.1.5
authorLaury GvR <laury@gaslightmedia.com>
Wed, 6 Nov 2019 18:12:47 +0000 (13:12 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 6 Nov 2019 18:12:47 +0000 (13:12 -0500)

Trivial merge