Fix thumbnail size when GD extension is used for image resize (#1488985)

Conflicts:

	CHANGELOG