upstream changes
Merge branch 'master' of https://github.com/igzivkov/blfs-patches