.
Merge branch 'master' into thomas
Stuff