Merge from trunk and from gnulib stdio.