rebased onto f33d8300fa46a790356ef24711a22378d952c7cb
rebased onto 4f5b69f8a7b22169226d580de11e86f48c6d0dea
Commit a5e029af fixes this pull-request
Pull-Request has been merged by tkopecek