rebased onto e658efe3d1b44d7cb7be629446aa3dff1e52fcf4
Commit f710ccd5 fixes this pull-request
Pull-Request has been merged by kparal