Merge pull request #2374 from tordans/patch-1