Merge upstream master in libre-soc master.