Patches for bugs introduced in 2.4 and 2.5 releases#187

missinglink merged 2 commits intopelias:masterpelias/parser:masterfrom

stadiamaps:regression-fixesstadiamaps/parser:regression-fixesCopy head branch name to clipboard