Merge branch 'hotfix/1.2.40' 1.2.40
authorlaury <laury@gaslightmedia.com>
Fri, 9 Nov 2018 16:09:48 +0000 (11:09 -0500)
committerlaury <laury@gaslightmedia.com>
Fri, 9 Nov 2018 16:09:48 +0000 (11:09 -0500)

Trivial merge