Bug 895269
Merge pull request #1159 from danmcp/master

Merged by openshift-bot