Merge pull request #3801 from megustamucho/master