Merge in librfse.