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)
commitaf1bb9588d5a9edd87c970e30bbeda882688d999
tree3acd42cb70d7f1070d3c61baeb6bb29f9e9fb8ae
parent8aa5af27d98bab5dda67be5af93ea8e8ec964cc4
parentbe01d697ebae035d8fa1db64bf048001be39a5c5
Merge tag 'v1.5.2' into develop

v1.5.2