Dockerfile update - speed things up
Merge branch 'master' into ids-in-lozenges-bug