rebased onto e75ad6ca0b1833441f31b78734352d06ee6a2f9e
rebased onto 64a003315073ae3b835dde9b9cd9564e104d64dc
Commit 51fbda70 fixes this pull-request
Pull-Request has been merged by tkopecek