Merge pull request #154 from nla/fix-name-conflict

Fix name conflict in JobRecord
Merge branch 'amber' into work-huw