Pulled in changes from upstream.