Code cleanup.
tagged version 2.1.2
Merged r10535 from trunk.
Updates for 2.1.2 release.
Merged r10465 from trunk.
tagged version 2.1.1
Merged r10531 from trunk.
Updates for 2.1.1 release.
Japanese translation updated by Go MAEDA (#11995)
Bulgarian translation updated by Ivan Cenov (#11994)