Fix #4258, clean up \OC_Image and improve its unittest
Merge branch 'master' into fix_4258

Conflicts:
	lib/image.php
Check for $this->fileInfo and @depend on testData()
Merge pull request #4329 from owncloud/fix_4258

Fix #4258 and improve unittest