Updated to more recent upstream (ba6a110a8a06057e09f0a124a12a228d1dabedd6)