Merge branch 'master' into errorinfo

Author: martinduffy1

src/lib_json/json_reader.cpp

@@ -1883,7 +1883,7 @@ class OurCharReader : public CharReader {
         : collectComments_(collectComments), reader_(features) {}
 
     bool parse(char const* beginDoc, char const* endDoc, Value* root,
-              String* errs) override {
+               String* errs) override {
       bool ok = reader_.parse(beginDoc, endDoc, *root, collectComments_);
       if (errs) {
         *errs = reader_.getFormattedErrorMessages();