Prepare release
Refs #1413: Avoid infinite loops when restoring the iterator position.
Merge branch '4.2' into 4.3