Merge branch 'master'
Merge branch 'thomas'