merging in devel.

merging devel in.