Remove loop that kept reading the same offset (Jan Kaluza)
Merge remote-tracking branch 'upstream/master'
merge with upstream