[Axiom-developer] merge branches/daly to trunk

[daly]

Gaby,

I'll test the trunk version.

Then I'll diff-Naur the trunk and branches/daly and then bring my
local tree up to date as well as the git public tree. 

Once that is done I'll do all future commits to trunk.

Tim