Merging commits from master into dev branch.