Improve output from -s and -c options.
Merge branch 'master' of https://github.com/wenzhuman/fonttools