Merge branch 'hotfix/1.1.40' v1.1.40
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 31 Jan 2019 18:03:51 +0000 (13:03 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 31 Jan 2019 18:03:51 +0000 (13:03 -0500)

Trivial merge