From master.
New master.
Nik commit.
Merge branches 'master' and 'nik' into nik