Merge branch 'release/1.6.87' v1.6.87
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 26 Jun 2018 18:06:16 +0000 (14:06 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 26 Jun 2018 18:06:16 +0000 (14:06 -0400)

Trivial merge