Merge pull request #1471 from yjacolin/patch-1