Merge branch 'utf-8'

diff --cc classes/Misc.php
Simple merge

diff --cc display.php
Simple merge

diff --cc tables.php
Simple merge

diff --cc tblproperties.php
Simple merge

diff --cc views.php
Simple merge