Switch to long for current
Merge branch 'udev-working' into udev