Merge pull request #2088 from landryb/fix/2061