Merge commit '64f2f2734ad853784bdd260bcf31e065c47c0741' into fix-configure-pthread...