Merge branch 'release/1.0.7' v1.0.7
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 2 May 2017 16:58:23 +0000 (12:58 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 2 May 2017 16:58:23 +0000 (12:58 -0400)

Trivial merge