Bug 963463
Merge pull request #2511 from danmcp/master

Merged by openshift-bot