Merging branch 'master'.