latest master rebuilt with all merges pulled in.