Merge from trunk.
Merge from trunk.
Comment fix.
Merge from trunk.
Clean-up.
Fixed bug.
Merge branch 'master' into pjl-misc
Merge branch 'master' into pjl-misc
Merge pull request #1 from 28msec/pjl-misc

Fix xml-json bug