I'll close this bug as the files are submitted upstream but acceptance may take a while (understatement).