Use the wrapper validate function only when there is a value in the field.
Merge branch '7.x-1.x' into 14