Merge branch 'vd/pthread-setspecific-g11-fix' into maint