Merge branch 'stride' into trunk.linux