Merge branch 'comments'
authorJessica Tallon <tsyesika@tsyesika.se>
Tue, 20 Oct 2015 13:02:15 +0000 (13:02 +0000)
committerJessica Tallon <tsyesika@tsyesika.se>
Tue, 20 Oct 2015 13:02:15 +0000 (13:02 +0000)

Trivial merge