Merge branch 'devicetree/merge' into devicetree/next