Merge pull request #2934 from antoinedeschenes/patch-1