bumped model-builder; merge from master