Updated Changes for release
Merge branch 'master' into devel