For Travis CI - another attempt to reshuffle for better upload grouping.
[ci skip]