_
Merge branch 'master' of https://github.com/rasom/gps

Conflicts: