foigus updates

Foigus updated the master.  Copied locally to match.