Updated to latest upstream merge