merge from Web Arena Plugin API branch