Merge from heptapod-stable branch

--HG--
branch : heptapod
3 jobs for topic/heptapod/hg-components in 84 minutes and 10 seconds (queued for 1 second)