Update xpressive from master.
Update polygon from master.