Merge branch 'release/1.6.54' v1.6.54
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 25 Jul 2017 19:42:56 +0000 (15:42 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 25 Jul 2017 19:42:56 +0000 (15:42 -0400)

Trivial merge