Merge branch 'master' into pe-dispatch

Dispatch (previously known as Traversal.)