rebased onto c57c1a03a9a41082291d8af20a176f1498decce8
rebased onto 729d3225565bc3fd1bf7aafdf2567352d6a5defc
Pull-Request has been merged by ngompa