Bug 975792
Merge pull request #3244 from danmcp/master

Merged by openshift-bot