Merge from 'master' branch.