Merge branch 'devel-2.6' into submit