closes Issue #1908
Merge commit 'ed4c1686360ab77e45cb893077d5af660d017d9e' into location-fixes