changes from halley cluster
Merge branch 'master' of ssh://github.com/kooshap/overseer