Merge branch 'hotfix/1.6.63' v1.6.63
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 30 Aug 2017 20:31:57 +0000 (16:31 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 30 Aug 2017 20:31:57 +0000 (16:31 -0400)

Trivial merge