[Bug 625363] Upgrade to new upstream version