Merge branch 'release/1.7.0' v1.7.0
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 24 Sep 2018 14:37:54 +0000 (10:37 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 24 Sep 2018 14:37:54 +0000 (10:37 -0400)

Trivial merge