Timo added to the participants list.
Merge branch 'master' into gh-pages