Fix #4495 Comment lines in multiquery

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
Merge branch 'master' into b4495_master

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>

Conflicts:
	ChangeLog
Remove trailing whitespace.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
Merge pull request #1388 from Tithugues/b4495_master

Fix #4495 Comment lines in multiquery