Merge branch 'master' of git.laquadrature.net:piphone/campaign into 4-tests-are-failing

1 job for 4-tests-are-failing in 47 seconds (queued for 2 seconds)