These patches have been merged into Taberareloo.