Merge 3.5 (test_warnings)