updating Devel with the Latest Master

Merging Master in to Devel