Bug 1039641
Merge pull request #4300 from danmcp/master

Merged by openshift-bot