Fixed type of limit and zip (c.f. Issue #678).
Merge branch '678_fix_limit_type' into next