Merge remote-tracking branch 'origin/Harsu'
Merge remote-tracking branch 'origin/master' into Petri