Merge pull request #3493 from danmcp/master

Merged by openshift-bot