Merge branch 'win32-color-fonts' into 'master'