Merge remote branch 'origin/devel' into devel
Merge branch 'master' into devel