Fixing bad merge
Merge pull request #1353 from kraman/master

Merged by openshift-bot