Merge tag 'v1.5.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 18:50:24 +0000 (14:50 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 18:50:24 +0000 (14:50 -0400)
v1.5.2


Trivial merge