Merge pull request #3059 from castillofrancodamian/master