Testing commit messages...
Sorry, wrong branch...
Merge branch 'master' into #352