Fixed issue with handling ways without nodes.
Merge remote-tracking branch 'upstream/master'