(Imported from upstream's 5615196f7bd467f1e56e275bf740a62caa04d107.)

Initial fork from f2d678e6e8 (1.0.2 beta).

(This change contains substantial changes from the original and
effectively starts a new history.)