Full Merge

tags, users, comment - fixed, we hope.