Updated to latest upstream stable version