Updated the bytecode editing stuff
Merge remote-tracking branch 'origin/2.x' into 2.x