Fixed #785: Certain validator names will cause a fatal error
merge 0471112e6a9b53b133c796944c696b0200efc252 to 1b17b34bb90795cf37739702cfdeccd4e2441496 (from 0.11)