I think I rebased back ok....
Merge branch 'master' of github.com:CRG-Barcelona/libbeato