Distinguish between iterators and iterables (the latter can be iterated over multiple times).
Merge remote-tracking branch 'origin/master'