Merge branch 'patch-124' into 'master'

Vint Cerf

See merge request !158
2 jobs for master in 17 seconds (queued for 1 second)