Merge branch 'release/1.0.7' v1.0.7
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 16 Jul 2018 15:24:09 +0000 (11:24 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 16 Jul 2018 15:24:09 +0000 (11:24 -0400)

Trivial merge