updates from duco
Mark Stevens authored
b417425b