Backports for 5.2.3#453

bighappyface merged 1 commit intojsonrainbow:5.x.xjsonrainbow/json-schema:5.x.xfrom

erayd:backport-523erayd/json-schema:backport-523Copy head branch name to clipboard