Merge pull request #356 from wardi/master

remove traces of old validation_override field