Bug 956859
Merge pull request #3231 from danmcp/master

Merged by openshift-bot