Merge master changes into dev branch.