Bug 1051203
Merge pull request #4496 from danmcp/master

Merged by openshift-bot