Merge branch 'configurable-disk-size' into 'master'

Make disk size configurable per image

Closes #127

See merge request !160
6 jobs for master in 35 minutes and 54 seconds (queued for 4 seconds)