Pull in latest changes from upstream.