Changes for CollabBallard
Merge branch 'master' of https://github.com/shanqing-cai/commonmcode