Merge branch 'release/1.0.40' v1.0.40
authorLaury GvR <laury@gaslightmedia.com>
Fri, 16 Nov 2018 22:04:30 +0000 (17:04 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 16 Nov 2018 22:04:30 +0000 (17:04 -0500)

Trivial merge