Distinguish between two identical error messages.
Obey the sacred 80 column rule.
Merge remote-tracking branch 'origin/slurm-14.03'