Merge branch '1.5-Comments-add' into 1.5

Closes GH-135