Merge tag 'v2.0.7' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 7 Jun 2016 17:00:08 +0000 (13:00 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 7 Jun 2016 17:00:08 +0000 (13:00 -0400)
v2.0.7


Trivial merge