Bug 998337
Merge pull request #4539 from danmcp/master

Merged by openshift-bot