Merge branch 'master' of gitlab.lelux.fi:lelux/wiki

2 jobs for master in 7 minutes and 59 seconds (queued for 4 seconds)