Merge branch 'release/1.0.7' v1.0.7
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Jun 2015 18:10:36 +0000 (14:10 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Jun 2015 18:10:36 +0000 (14:10 -0400)

Trivial merge