Bug 1029147
Merge pull request #4157 from danmcp/master

Merged by openshift-bot