able to resize the uploaded image when its size is larger than assigned(fixed #3563)
Merge remote-tracking branch 'origin/pr/126' into stable-3.6.x (fixes #3563, BP from #3561)

Conflicts:
	lib/model/doctrine/File.class.php