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