Merge branch 'thomas'