Version number modified.
Reintegrating [4.0] branch.