last changes for Oct 17, down to supplemental figures and tables
Merge remote-tracking branch 'ae/master' into ae
Merge branch 'ae' into cf