Merges in changes from master branch.