cargomedia/CM — pull request #1525 by njam (2014-12-04 13:01:03+00:00)
Title: Refactor location helper

@christopheschwyzer please review