Update regex, config from master.