Patched irods with svn:r5585 changes