Fixes bug 1029536 - allow hyphens in RID