[Bug 915295] Upgrade to new upstream version