Merge branch 'leogao'