Merge branch 'master' into QJson_Experiments