Merge tag 'v2.1.24' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 17:22:21 +0000 (13:22 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 17:22:21 +0000 (13:22 -0400)
v2.1.24


Trivial merge