Merge remote-tracking branch 'mfischer/libxslt' into next