Should be 'and'

Otherwise a valid value like '105078134_1.jpg' passes.
Merge remote-tracking branch 'upstream/2.2/develop' into projects/cardworld/develop