Merge branch 'release/1.6.99' v1.6.99
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 30 Aug 2018 13:02:33 +0000 (09:02 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 30 Aug 2018 13:02:33 +0000 (09:02 -0400)

Trivial merge