Merge branches 'heads/dt2' and 'heads/multiarch' into devel