Merge pull request #3130 from nhr/updates

Merged by openshift-bot