Merge branch 'master' into andy128kr