Update foam/ to latest master