Deprecated json.loadf and dumpf.
Merge remote-tracking branch 'trunk/master'