proposal for #2051
Merge pull request #2052 from Guite/1.4

proposal for #2051