Merge branch 'devel-2.1' into stable-2.1