Merge pull request #1148 from steffen-kiess/json