rebased onto 513c619a0c82a18c386226be737bd70717077169
rebased onto 5289156f29ee9d0a6d08cf8cfedee49778d15097
Commit 1a71dcef fixes this pull-request
Pull-Request has been merged by tkopecek