Remove references to (deleted) functions_utf-8.php
Merge remote-tracking branch 'upstream/master'