Merge branch 'devel-2.5'