Upgrade Zinc 0.2.5, close #1110