Merge branch 'patch-1' into 'master'

Because mastodon:setup isn't run, we need to compile manually

See merge request !43
Status Job ID Name Coverage
  Test
canceled #1524
pages