Merge branch 'hotfix/1.6.52' v1.6.52
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Jul 2017 20:38:29 +0000 (16:38 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Jul 2017 20:38:29 +0000 (16:38 -0400)

Trivial merge