Merge branch 'devel-2.1' into master