Merge branch 'hotfix/2.1.24' v2.1.24
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 17:22:15 +0000 (13:22 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 17:22:15 +0000 (13:22 -0400)

Trivial merge