Merge branch 'release/1.5.40' master v1.5.40
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 27 Mar 2019 18:50:50 +0000 (14:50 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 27 Mar 2019 18:50:50 +0000 (14:50 -0400)

Trivial merge