Merge test_startfile fix from 3.1.