Merge branch 'hotfix/1.2.7' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 17 Jun 2016 21:11:12 +0000 (17:11 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 17 Jun 2016 21:11:12 +0000 (17:11 -0400)

Trivial merge