BZ-12750: assure that a user's location is cached properly
Merge remote-tracking branch 'origin/RC20140731' into RC20140807

* origin/RC20140731:
  BZ-12750: assure that a user's location is cached properly