Merge pull request #941 from jay-hodgson/develop

merge from release-40
convert font sizes from px to em, confirmed no visible change