Zap TK 2.1.7

  • Minor internal improvements.