Merge branch 'master' into icons2