Merge branch 'release/1.6.96' v1.6.96
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 24 Aug 2018 12:23:25 +0000 (08:23 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 24 Aug 2018 12:23:25 +0000 (08:23 -0400)

Trivial merge