minor bugfix
Merge branch 'origin/devel'