Merge branch 'master' into dev
geotagged
Merge branch 'dev'