Merged upstream Tusky version 12.1
This tag has no release notes.