Refs #6445 - Foreman update
Merge pull request #90 from ares/master

Foreman update