Commit what I think is done
Commit current changes to comments on the addcomments branch
Merged master into purgelogs