Merge remote-tracking branch 'upstream/develop' into develop
missing to load hLocation
Merge pull request #1213 from conejoninja/1206

1206