Applying changes from DEPI infrasructure repo.
Merge pull request #1 from icaughley/master

Applying changes from DEPI infrastructure repo.