Merge branch 'release/1.0.7' v1.0.7
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 1 Nov 2017 16:38:07 +0000 (12:38 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 1 Nov 2017 16:38:07 +0000 (12:38 -0400)

Trivial merge