Bug 966465
Merge pull request #2665 from danmcp/master

Merged by openshift-bot