Bug 940659: new buildmasters; a=nodechange