Merge branch 'master' into add/pl-translation

- updates and 27773ac