Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #66828: iconv_mime_encode Q-encoding longer than it should be

diff --cc NEWS
Simple merge

diff --cc ext/iconv/iconv.c
Simple merge