Bug 975255
Merge pull request #2882 from danmcp/master

Merged by openshift-bot