Update to latest master and fix a bug from a bad search-replace.