Catching up master branch

I guess we did not followed the pattern we chose. That is:
Pull requests in QA.
When modifications passes the builbot in QA they can be merged in devel
and when it is stable enough, moved to master