Bug 957073
Merge pull request #2252 from danmcp/master

Merged by openshift-bot