(Imported from upstream's bf2d129194d5a8f2ccf5ff5261ab755e4fc9f98e)
Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)