Merge branch 'release/1.0.7' v1.0.7
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 17 Oct 2016 20:47:34 +0000 (16:47 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 17 Oct 2016 20:47:34 +0000 (16:47 -0400)

Trivial merge