All but Longitude working.
Merge branch 'refs/heads/master' into schwa_upload