Merge pull request #1994 from jcarreiro/master