Merge branch 'hotfix/1.6.39' v1.6.39
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 18 May 2017 18:27:00 +0000 (14:27 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 18 May 2017 18:27:00 +0000 (14:27 -0400)

Trivial merge