rebased onto bd49c21fb7fb556e0c53cb20b069f2a345ea358e
+1
Commit 2b8f88a8 fixes this pull-request
Pull-Request has been merged by jkaluza