Raise the correct exception on parse errors in Json.read_file
More descriptive exception text
Merge branch 'stable'

Include fixes made in "stable" in "master"