automerge: 7e39385 * commit '7e393853656387757da2531d4e504d7cf32e738e': Update platform.dir search in tests.