Merge branch 'hotfix/1.6.62' v1.6.62
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 30 Aug 2017 20:24:56 +0000 (16:24 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 30 Aug 2017 20:24:56 +0000 (16:24 -0400)

Trivial merge