updated to latest upstream version