Documentation for custom validation with annotations
Merge remote-tracking branch 'upstream/master'