regenerated EMV2 against the modified properties grammar for allowing
references to start with a classifier.
Merge remote-tracking branch 'origin/develop' into develop