Merge branch 'hotfix/1.5.2' v1.5.2
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 18:50:14 +0000 (14:50 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 18:50:14 +0000 (14:50 -0400)

Trivial merge