Reformat locations data before output
Merge branch 'origin/master'