Merge build fix into Master.