Merge pull request #1061 from sethjackson/L_cuserid