Merge branch 'stable' into stable-cxf