Bug 965591
Merge pull request #2669 from danmcp/master

Merged by openshift-bot