I've updated the beta branch with the changes for the 5/21 patch. Latest version is 6.0.0.0-pre16, svn commit 1034.