- Add patch from William McKee <william@knowmad.com> to support