Merge branch 'release/1.6.40' v1.6.40
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 25 May 2017 15:40:16 +0000 (11:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 25 May 2017 15:40:16 +0000 (11:40 -0400)

Trivial merge