Merge pull request #3814 from thess/libextractor-update