Spurious comma in 3.1.3.1

Lines 842/3 currently say

"The Server MAY restrict the ClientId it allows in terms of their lengths and the characters they contain,. "

i) There is a spurious comma following the word "contain"
ii) The word "ClientId" is singular, but it is referred to in the plural by "their lengths" and "they contain"