The RelWithDebInfo build using g++ timed out, but all the other builds were successful.

Hmm... It seems the performance of the Travis infrastructure is fluctuating again.

I restarted that job. Let's see what will happen.

Thanks for restarting the job. I had some timeout on another pull request, but I need to fix some formatting, so that will restart the job there.

Still the same build failing, but this time it is due to one of the unit test (spirv-tools-test_spirv_unit_tests), however that test is also failing on master.

I suspect the conflict is a trivial conflict with the --verify-ids change. I can resolve that locally.

I would guess so as well; I initially had this series on top of the verify-ids one, and rebasing it onto master led to some conflicts, but I thought I was still better to have them separate.
Thanks for the review.

Rebased, resolved conflict, and pushed into master as bdd6617