Merge pull request #1758 from migbac/master