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

2 jobs for master in 6 minutes and 59 seconds (queued for 3 seconds)