Nik branch.
Nik commit.
Merge branches 'master' and 'nik' into nik
Merge pull request #1 from niklasi/nik

Nik