I've updated the beta branch with the changes for the 6/17 patch. Latest version is 6.0.0.0-pre17, svn commit 1037.