Merge "Python 3: use next() instead of iterator.next()"