rebased onto b3191e32602b22096e7db066d591d406684e2e49
Commit 4719dbfa fixes this pull-request
Pull-Request has been merged by astepano