merging changes from dg_dev (except for one late commit of Merge.pm which is from trunk)
Changed paths: