Merge from gnulib for 'inline', incorporating: