Merge branch 'devel-2.0' into devel-2.1