Updated to latest upstream version