am d1c6786d: Merge "Fix zone.tab parsing."

* commit 'd1c6786d289258a054a57eaae6a0700b74fb0157':
  Fix zone.tab parsing.