Merge with cjhanks/PyUDT master