Fix PHP warning when responding to a message with many Return-Path headers (#1489136)

Conflicts:

	CHANGELOG