features of interest infrastructure
Merge branch 'master' of github.com:lgatto/MSnbase
Merge remote-tracking branch 'upstream/master'