Applied to master, thanks! :-)