Add a comma if necessary when combining options
Merge branch 'master' of /u/nlp/git/javanlp