Merge pull request from master.