font.size fix for newer matplotlib
Merge branch 'master' into dev-v1.1