Integrating MGB - interim check-in so I can test in Matlab at CCRMA (remotely)
commit required for merge