Commit 82a1aab647c9a587e0b8959719a6ea507a68ea31

Edward Thomson 2016-03-18T12:59:35

iterator: move the index into the iterator itself