Merge branch 'develop' into 'master'

change back to root dir

See merge request !61
2 jobs for master in 2 minutes and 54 seconds