Merge tag 'v1.2.24' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 9 Mar 2016 18:43:39 +0000 (13:43 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 9 Mar 2016 18:43:39 +0000 (13:43 -0500)
v1.2.24


Trivial merge