Merge remote-tracking branch 'grant/devicetree/merge' into dt-fixes