Merge branch 'new_baseimage' into 'master'

changed to new base image

See merge request !25
2 jobs for master