Merge branch 'master' into experiments
Turned off printing of history for major experimental problems.
Merge branch 'experiments' into experiments-plus-age