Merge commit 'e98ed06e17e28a11609caf133a08b3ced21a049a' * commit 'e98ed06e17e28a11609caf133a08b3ced21a049a': Make runtest --path smarter when choosing path to build.
Merge commit 'e98ed06e17e28a11609caf133a08b3ced21a049a' * commit 'e98ed06e17e28a11609caf133a08b3ced21a049a': Make runtest --path smarter when choosing path to build.