Fix versioning test randomly failing under Linux by increasing the versioning delay
Merge branch 'master' into 5.6.0