backported change
Merge pull request #2 from yannickl88/1.1

backported change