Merge branch 'release/1.0.7' v1.0.7
authorLaury GvR <laury@gaslightmedia.com>
Wed, 28 Oct 2015 15:32:19 +0000 (11:32 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 28 Oct 2015 15:32:19 +0000 (11:32 -0400)

Trivial merge