Merge upstream fixes from 2.066 development
Testsuite fixes on x32