Add missing check offset test (Francisco Alonso, Jan Kaluza at RedHat)
More bugs
Merge remote-tracking branch 'upstream/master'
merge with upstream