Fix wrong combined paths when traversing upwards. Fixes #557#652

DannyvdSluijs merged 2 commits intojsonrainbow:masterjsonrainbow/json-schema:masterfrom

uncaught:masteruncaught/json-schema:masterCopy head branch name to clipboard