Merge branch 'patch-1' into 'master'

Conversation is not a sub-entity of Tag.

See merge request !36
2 jobs from master in 22 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #1420
pages

00:22

 
  Deploy
passed pages:deploy

00:00