sync with upstream.
sync with upstream. [1st round got (!) incomplete sources in.]