optimized docker image
Merge branch 'master' into devel