Make the label making function use the user-specified font size
Merge branch 'master' into unstable