Upgrade Zinc 0.3.1-M1, close #1470