Merge branch 'guavafix' into 'master'

Guavafix

See merge request !23
2 jobs for master in 3 minutes and 38 seconds