Bug 1028518
Merge pull request #4151 from danmcp/master

Merged by openshift-bot