Update xssi.rb to fill the new framework
Merge branch 'chinazoujy-patch-21' into dev/0.8.0