Change diamond to U+25CA LOZENGE
Merge remote-tracking branch 'origin/master' into native