Update to reflect new Matlab-specific branch.