Merge branch 'release/1.6.82' v1.6.82
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 27 Apr 2018 15:24:10 +0000 (11:24 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 27 Apr 2018 15:24:10 +0000 (11:24 -0400)

Trivial merge