Merge-Devel

Michele Carpenerequested to merge
devel into master

merging last devel branch into master

Merge request reports