Bug 971265
Merge pull request #3145 from danmcp/master

Merged by openshift-bot