Merge branch 'udev-disk'