Merging commit from pull request (from master)