Merge branch 'hotfix/2.0.7' v2.0.7
authorLaury GvR <laury@gaslightmedia.com>
Tue, 7 Jun 2016 17:00:03 +0000 (13:00 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 7 Jun 2016 17:00:03 +0000 (13:00 -0400)

Trivial merge