+ more good stuff for location detection
Merge remote-tracking branch 'origin/develop' into develop