Java6 empty iterators
Implements #934
Merge pull request #935 from emmanuel-keller/1.5

Implements #934