Merge tag 'V1.2.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 17:19:08 +0000 (13:19 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 17:19:08 +0000 (13:19 -0400)
v1.2.4


Trivial merge