Merge branch 'master' into juppe/rupi
Merge branch 'juppe/rupi' into oskari/kulupros1