merging this branch to facilitate moving repo to ActiveSCM, then will st...

...art branch over again