rebased onto eec19c75fcf6448dbf63f07c93f9ee0e4076e002
Pull-Request has been merged by zlopez
Thanks for the PR