Catch-up merge from master sources @186035 to branch/2014-03-25/ansi.
Catch-up merge of testrun.bat (somehow got omitted).
Catch-up merge of testrun.sh (somehow got omitted).
Fumbled the merge.