remove obsolete line
Merge branch 'master' into marshaling