A line to make iteration estimates work was commented out, so I uncommented it.
Merge remote-tracking branch 'origin/team1-dev' into team1-dev