Merge pull request #1358 from rogerpueyo/master