Add more documentation
Merge remote-tracking branch 'upstream/master'
Store the comma so that we can regenerate it correctly.