Merge branch 'release/1.6.97' v1.6.97
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 29 Aug 2018 15:45:25 +0000 (11:45 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 29 Aug 2018 15:45:25 +0000 (11:45 -0400)

Trivial merge