Fixing unstable builds
Merge pull request #94 from danmcp/master

Merged by openshift-bot