Merge pull request #3251 from hugok79/patch-1