Merge branch 'master' into devel
bug fix
Merge branch 'devel'