Merge pull request #3491 from danmcp/master

Merged by openshift-bot