Back to development
Fix 3D length shorter than 2D length (fixes #1337)

Add all original points in addition to points sampling when draping
Add a geom_3d sampling test
Merge pull request #1338 from makinacorpus/1337_3d_length

Fix 3D length shorter than 2D length
Fix 'Information desks' translation in public trek ODT template
Update changelog
Upgrade paperclip/convertit/mapentity
Override prepare_map_images command to skip deleted objects
Merge pull request #1339 from makinacorpus/fix_gtrois

Fix for guillestrois
Merge branch 'master' into develop
Revert "increase convertit timeout"

This reverts commit b579a842eb39e424e9b02f788b0a5688b52fd2c6.
Bump version