Merge pull request #251 from ChALkeR/json-parse

Use JSON.parse instead of eval() when possible.
Merge remote-tracking branch 'origin/release-2.1' into release-3.0-autoload