Git/gpstools/: New commits

6e855090-3d44-11e4-934f-c80aa9e67bbd