Merge branch 'hotfix/1.6.56' v1.6.56
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 28 Jul 2017 13:23:20 +0000 (09:23 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 28 Jul 2017 13:23:20 +0000 (09:23 -0400)

Trivial merge