merge from make.conf.9.1-reallyenglish