Added json2.js for old browsers without JSON object.
Merge remote-tracking branch 'upstream/master'
Fix timeout to be ms not s.