Merged to trunk in #3002 and to 0.6-main in #2966. (The walktrap classes are not part of the public API so we can do this).
Merged to trunk in #3002 and to 0.6-main in #2966. (The walktrap classes are not part of the public API so we can do this).