rebased onto 15a30887634a240f0eaa24f4049b3736a258ed18
rebased onto e36df288c779ab7ae84415acae1105643b859b18
Thank you!
Commit de97478c fixes this pull-request
Pull-Request has been merged by astepano