Merge tag 'v1.0.7' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 10 Jun 2015 15:18:10 +0000 (11:18 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 10 Jun 2015 15:18:10 +0000 (11:18 -0400)
v1.0.7


Trivial merge