Full commit
Merge Rudy/master