Fixes edina/fieldtrip-gps-tracking#1
Merge branch 'master' of ssh://github.com/edina/fieldtrip-open