Merge tag 'v1.0.7' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 20:38:36 +0000 (15:38 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 20:38:36 +0000 (15:38 -0500)
v1.0.7


Trivial merge