Sanity check
Merge remote-tracking branch 'origin/slurm-2.6'