MERGE documentbased branch [45]:[46] into trunk
MERGE documentbased branch [45]:[46] into trunk

git-svn-id: 73de3f159d2d61c768ffd1f162e93909b6e2df22@47 ea3e3d88-1103-4116-9a39-8646a12f7446

azu/JSONAccelerator,squalx/JSONAccelerator