rebased onto c5a2eaa1ff2d296e1fe0bc6e5d67ea26c8b3c275
Nice, thanks for fixing these!
Pull-Request has been merged by psss