Merge branch 'valls-patch-7' into 'master'

Update sphinx version which fix MarkupSafe failing constraint

See merge request !3731
10 jobs for master in 44 minutes and 52 seconds (queued for 2 seconds)