Merge pull request #2357 from Ansuel/mastero