Nr 2. Merge branch 'master'.