news for next tag
Merge remote-tracking branch 'origin/slurm-2.5'

Conflicts:
	NEWS
news for next tag