Mapillary merge

Squashed 53 commits in #2324 into one - need to review to make sure that git magic was correct.