Merge pull request #1592 from damianorenfer/master