Merge pull request #1468 from lnader/master

Merged by openshift-bot