Fix edina/fieldtrip-gb#32
Merge branch 'master' of github.com:edina/fieldtrip-open