Clear comment
Merge remote-tracking branch 'origin/Daniel'
Merge branch 'master' into Martin