Merge branch 'stable-2.2' into devel-2.2