Merge pull request #3093 from castillofrancodamian/master