9ead041cdb
This reverts commitaf62237d0e. This reverts commit87a4194fdc. This reverts commitb2c66eb60c. Conflicts: version.php