Merge pull request #1354 from fededim/master