Merge pull request #1726 from rubenk/udev