Merge tag 'v1.0.7' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 11 Jan 2016 19:41:49 +0000 (14:41 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 11 Jan 2016 19:41:49 +0000 (14:41 -0500)
v1.0.7


Trivial merge