Merge remote-tracking branch 'origin/master' into 7-bamboo
Removed now useless file
Merge branch '7-bamboo'