Added a patch from #13949 since we need it; update the URL of our repository in the README.
Merge branch 'master' of github.com:roed314/OMS