adding devel 3
Merge branch 'master' into devel