Merge branch 'dev' into 'master'

Complete exercise 3

See merge request !31
2 jobs for master in 3 minutes and 1 second
latest