Merge branch 'hotfix/1.6.55' v1.6.55
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 27 Jul 2017 15:21:55 +0000 (11:21 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 27 Jul 2017 15:21:55 +0000 (11:21 -0400)

Trivial merge