Use iterators.
Merge branch 'master' into java-task-lib