Merge tag 'v1.0.7' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 22 Jun 2015 17:59:27 +0000 (13:59 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 22 Jun 2015 17:59:27 +0000 (13:59 -0400)
v1.0.7


Trivial merge