Merge branch 'v4-0-stable' into newmaster