Merge branch 'master' into 'tex'

2 jobs for tex in 46 seconds (queued for 2 seconds)