Merge branch 'master' into 'master'
Small fixes and improvements
See merge request pleroma/auto_linker!2