Imported from dado-1.4.3.tar.gz
Merge branch 'upstream'
update to Dado 1.4.3