Clean up the 2D library fix for the Editor.
Merge remote-tracking branch 'upstream/master'
update pipe