Turned off debugging
Merge branch 'master' into hoyt