Pull in latest upstream changes