Merge tag 'v1.6.40' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 25 May 2017 15:40:23 +0000 (11:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 25 May 2017 15:40:23 +0000 (11:40 -0400)
Version 1.6.40


Trivial merge