Merged Werner's changes from the trunk to the 1.5.3 branch
11 files changed