Merge branch 'develop' of https://github.com/nlohmann/json into issue2189