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

* commit '4f58e9626327d514a9dea4f517072b7e5ad0b09d':
  Fix wrong assumptions about ParallelMove.