upstream/3.6
220ecbef · Add padding for text background ·