Merge pull request #3015 from FernetMenta/guilib