am 1f940310: Merge "Fix wrong assumptions about ParallelMove."

* commit '1f940310658cd5a15e12305463fb6d2d508bbd26':
  Fix wrong assumptions about ParallelMove.