Bug 971876
Merge pull request #2804 from danmcp/master

Merged by openshift-bot