Merge branch 'hotfix/1.2.4' V1.2.4
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 17:19:02 +0000 (13:19 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 17:19:02 +0000 (13:19 -0400)

Trivial merge