Merge remote-tracking branch 'origin/tp31'

Conflicts:
	docs/src/reference/the-traversal.asciidoc