Removed reference to control font

(bringing branch up-to-date with master)