Apply 'added_geotags_and_proxy.diff' proposed by Comtrade (but some minor edits)

1 job for master