Use latest machinist updates.
Merge remote-tracking branch 'local-master/master' into coop