Looks like it looks OK like this on a Mac
bumb version
Merge branch 'master' into ospalh-special