r2944: applying changes from the 2.2.12 release

No match.