Commit ae60e138 authored by Björn Bartels's avatar Björn Bartels

Merge branch 'docker' into 'master'

Docker

See merge request !14
parents 77e7dfff 70858fb0