Merge branch 'gpu-mem' into 'master'

Do not automatically remove G from the GPU memory requirements

Closes #30

See merge request !26
2 jobs for gpu-mem in 3 minutes and 38 seconds (queued for 4 seconds)
Status Job ID Name Coverage
  Build
passed #162632
docker
build_linux_36

00:02:20

53.0%
passed #162633
macosx
build_macosx_36

00:03:38

53.0%