Bug 967518
Merge pull request #2650 from danmcp/master

Merged by openshift-bot