Merge pull request #3371 from NicolasSchneider/2.2/develop

Fix image field type validation.
PHP strict bitches about this.