rebased onto e0a6993425ada8c424a3d67d36dfc63ed5c97943
Looks good, thanks!
Pull-Request has been merged by pbokoc