Remerged 3446d3f07946 and 0fd23055db15: the merge in 491d6aa69509 was incorrect due to badly configured merge tool